Fix IDE crash on @AfterClass #3027
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This is a workarround for a infinite fold done on Apply(Select(New(TypeTree[TypeRef(ThisType(TypeRef(NoPrefix,annotation)),Target)]),<init>),List(NamedArg(value,JavaSeqLiteral(List(Literal(Constant(val ANNOTATION_TYPE))), TypeTree[TypeRef(ThisType(TypeRef(NoPrefix,annotation)),ElementType)]))))
Select(New(TypeTree[TypeRef(ThisType(TypeRef(NoPrefix,annotation)),Target)]),<init>)
New(TypeTree[TypeRef(ThisType(TypeRef(NoPrefix,annotation)),Target)])
Apply(Select(New(TypeTree[TypeRef(ThisType(TypeRef(NoPrefix,annotation)),Target)]),<init>),List(NamedArg(value,JavaSeqLiteral(List(Literal(Constant(val ANNOTATION_TYPE))), TypeTree[TypeRef(ThisType(TypeRef(NoPrefix,annotation)),ElementType)]))))
... |
nicolasstucki
force-pushed
the
fix-ide-crash-on-java-annotations
branch
from
27032b5 to
80c57f2
Compare
|
@odersky, completely reimplemented the fix. I found the source of the issue and fixed it there. |
nicolasstucki
force-pushed
the
fix-ide-crash-on-java-annotations
branch
from
80c57f2 to
dda2256
Compare
|
Resigned to @smarter as the code is it involves the IDE |
smarter
approved these changes
Sep 12, 2017
|
Maybe add a comment explaining why this is necessary. |
smarter
reviewed
Sep 12, 2017
| if (!t.symbol.isCompleted) t.symbol.info = UnspecifiedErrorType | ||
| t.symbol.annotations.foreach(annot => cleanup(annot.tree)) | ||
| private def cleanup(tree: tpd.Tree)(implicit ctx: Context): Unit = { | ||
| val cleanedTree = mutable.Set.empty[tpd.Tree] |
There was a problem hiding this comment.
I think I would call this variable seen, this is the name we commonly use in the compiler for cycle detection.
The TreeAccumulator was stuck in an infinite loop over the synthetic constructor of java annotations. This could be reproduced by opening the CompilationTests.scala in the IDE.
nicolasstucki
force-pushed
the
fix-ide-crash-on-java-annotations
branch
from
fa2af08 to
c552416
Compare
| cleanedTree += tree | ||
| tree.foreachSubTree { t => | ||
| if (t.hasType) { | ||
| if (t.symbol.exists) { |
There was a problem hiding this comment.
if (t.hasType && t.symbol.exists) ?
|
@allanrenucci, could you review the last commit and merge if ok. |
|
As suggested by @smarter, I would add a comment explaining why this is necessary. Otherwise LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The TreeAccumulater was stuck in an infinite loop over the
synthetic constructor of java annotations. This could be reproduced
by opening the CompilationTests.scala in the IDE.